Some tweaks to the restore and migrate tests to expose the consoles of the

restored DomUs, since they currently Oops on x86_64.

diff --git a/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py b/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py
index af45e092ea0ebc01c98f0a619b2489f3fc66f7d0..4895e9c7191dc87125a490e145825b908a4157ba 100644 (file)
--- a/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py
+++ b/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py
@@ -38,8 +38,8 @@ except ConsoleError, e:
 try:
     # Activate the console
     console.sendInput("foo")
-    # Make sure a command succeeds
-    run = console.runCmd("ls /bin")
+    # Set a variable to check on the other side
+    run = console.runCmd("foo=bar")
 except ConsoleError, e:
     FAIL(str(e))
 
@@ -66,18 +66,21 @@ if (old_domid == new_domid):
 # Attach a console to it
 try:
     console = XmConsole(domain.getName(), historySaveCmds=True)
+    console.debugMe = True
 except ConsoleError, e:
     pass
 
+console.sendInput("ls")
+
 # Run 'ls'
 try:
     # Check the dmesg output on the domU
-    run = console.runCmd("ls /bin")
+    run = console.runCmd("echo xx$foo")
 except ConsoleError, e:
     FAIL(str(e))
-
-if not re.search("chmod", run["output"]):
-    FAIL("invalid console output from ls after migration")
+    
+if not re.search("bar", run["output"]):
+    FAIL("Migrated domain has been reset")
 
 # Close the console
 console.closeConsole()

diff --git a/tools/xm-test/tests/restore/01_restore_basic_pos.py b/tools/xm-test/tests/restore/01_restore_basic_pos.py
index df9c8018dd8ba463a697fdc2f4732ddab61f279c..82541485250f1f7390280f4a122bfe62f17f0a0b 100644 (file)
--- a/tools/xm-test/tests/restore/01_restore_basic_pos.py
+++ b/tools/xm-test/tests/restore/01_restore_basic_pos.py
@@ -25,6 +25,8 @@ except DomainError, e:
 # Make sure the domain isn't DOA
 try:
     console = XmConsole(domain.getName())
+    console.sendInput("input")
+    console.runCmd("foo=bar")
 except ConsoleError, e:
     FAIL(str(e))
 
@@ -63,9 +65,12 @@ if not isDomainRunning(domain.getName()):
 # Make sure it's alive
 try:
     newConsole = XmConsole(domain.getName())
-    run = newConsole.runCmd("ls")
-    if run["return"] != 0:
-        FAIL("Unable to read from restored domain")
+    # Enable debug dumping because this generates a Oops on x86_64
+    newConsole.debugMe = True
+    newConsole.sendInput("ls")
+    run = newConsole.runCmd("echo xx$foo")
+    if not re.search("bar", run["output"]):
+        FAIL("Restored domain has been reset")
 except ConsoleError, e:
     FAIL("Restored domain is dead (%s)" % str(e))
 

diff --git a/tools/xm-test/tests/restore/04_restore_withdevices_pos.py b/tools/xm-test/tests/restore/04_restore_withdevices_pos.py
index 3c3d998b2fd19c585bd0cbd0d412d77631c43768..0b82943142b605087b81ffc8e3a15e8098afdc5b 100644 (file)
--- a/tools/xm-test/tests/restore/04_restore_withdevices_pos.py
+++ b/tools/xm-test/tests/restore/04_restore_withdevices_pos.py
@@ -90,6 +90,11 @@ if s != 0:
 
 try:
     console = XmConsole(domain.getName())
+    # Enable debug dumping, as this causes an Oops on x86_64
+    console.debugMe = True
+
+    # In case the domain is rebooted
+    console.sendInput("ls")
 
     run = console.runCmd("ls | grep proc")
     if run["return"] != 0: